t / t4135 / diff-with spaces.diffon commit merge: setup `opts` later in `checkout_fast_forward()` (89e653d)
   1--- post image.txt.orig 2010-08-18 20:13:31.544002255 -0500
   2+++ post image.txt      2010-08-18 20:13:31.544002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage